From 30761439f6fb2800a6d26a91ba621117aeaa1381 Mon Sep 17 00:00:00 2001 From: Chanaka Jayasena Date: Fri, 17 Jan 2014 21:08:16 +0530 Subject: [PATCH 9/9] Adding 404 page and adding one field to policy page --- .../console/asset.jag | 5 ++ .../console/config/acl.json | 4 +- .../console/permission-mapping.txt | 19 ++++++ .../console/themes/theme1/pages/plain.hbs | 67 ++++++++++++++++++++ .../console/themes/theme1/partials/404.hbs | 31 +++++++++ .../console/themes/theme1/partials/header.hbs | 7 +-- .../themes/theme1/partials/policy_deployments.hbs | 15 ++++- .../console/themes/theme1/renderers/asset.js | 38 +++++++++++ 8 files changed, 177 insertions(+), 9 deletions(-) create mode 100644 components/org.apache.stratos.manager.console/console/asset.jag create mode 100644 components/org.apache.stratos.manager.console/console/permission-mapping.txt create mode 100644 components/org.apache.stratos.manager.console/console/themes/theme1/pages/plain.hbs create mode 100644 components/org.apache.stratos.manager.console/console/themes/theme1/partials/404.hbs create mode 100644 components/org.apache.stratos.manager.console/console/themes/theme1/renderers/asset.js diff --git a/components/org.apache.stratos.manager.console/console/asset.jag b/components/org.apache.stratos.manager.console/console/asset.jag new file mode 100644 index 0000000..f222473 --- /dev/null +++ b/components/org.apache.stratos.manager.console/console/asset.jag @@ -0,0 +1,5 @@ +<% +var caramel = require('caramel') +caramel.render({ +}); +%> \ No newline at end of file diff --git a/components/org.apache.stratos.manager.console/console/config/acl.json b/components/org.apache.stratos.manager.console/console/config/acl.json index 8b4b6c2..5422611 100644 --- a/components/org.apache.stratos.manager.console/console/config/acl.json +++ b/components/org.apache.stratos.manager.console/console/config/acl.json @@ -1,10 +1,10 @@ { "carbonsuper": { - "admin": ["view", "edit", "add", "tenant-edit"], + "admin": ["view", "edit", "subscribe","configure","tenant-mgt", "tenant-edit"], "Internal/Everyone": ["view", "tenant-edit"] }, "tenants": { - "admin": ["view", "post"], + "admin": ["view","subscribe", "post"], "Internal/Everyone": ["test1","test2","view"] } } \ No newline at end of file diff --git a/components/org.apache.stratos.manager.console/console/permission-mapping.txt b/components/org.apache.stratos.manager.console/console/permission-mapping.txt new file mode 100644 index 0000000..c56f6cd --- /dev/null +++ b/components/org.apache.stratos.manager.console/console/permission-mapping.txt @@ -0,0 +1,19 @@ +View subscribed cartridges - view +View cartridges - view + +Subscribe to cartridges - subscribe + +Partition Deploy - configure +View Partitions - configure +Policy Deployments - configure +View Deployments - configure +LBs Deployments - configure +View Deployments - configure +Cartridge Deployments - configure +View Cartridges - configure +Multi-Tenant Service Deployments - configure +View MT Service Deployments - configure + +View Tenants - tenant-mgt + +Configure Stratos Wizard - configure \ No newline at end of file diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/pages/plain.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/pages/plain.hbs new file mode 100644 index 0000000..b33b1d0 --- /dev/null +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/pages/plain.hbs @@ -0,0 +1,67 @@ + + + + + + + + + + {{include title}} + + + + + + + + + + + +

+ + + + + +

+ + {{include body}} + + + +

+

+ + + + + + + + + + + diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/404.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/404.hbs new file mode 100644 index 0000000..19d4c06 --- /dev/null +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/404.hbs @@ -0,0 +1,31 @@ +

+ + + +

+

+

+

+ +

OOPS!

+

+

+

+

+

+

+

We are really sorry but the page you requested cannot be found.

+

+

+

+ +

+ It seems that the a page you were trying to reach doesn't exist anymore, or maybe it has just moved. We think that the best thing to do is to start again from the home page. Feel free to contact us if the problem persist or if you definitely can't find what you are looking for. Thank you very much. +

+

+

diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs index 23f5082..eea3ce2 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs @@ -16,18 +16,13 @@

- {{#ifAllowed "tenant-mgt"}} - can tenant-mgt - {{else}} - can't tenant-mgt - {{/ifAllowed}}

My Cartridges
Configure Stratos
Configure Stratos
Tenant Mgt

Deploy New Policy

- Policy Configuration +

+ Policy Type + +

+

+ + Auto scale + + + Deployment + +

+

+ Policy Configuration Cancel diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/asset.js b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/asset.js new file mode 100644 index 0000000..3aaf2c7 --- /dev/null +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/asset.js @@ -0,0 +1,38 @@ +var render = function (theme, data, meta, require) { + // Re-create the data structure of the cartridges. + + theme('plain', { + body: [ + { + partial: '404', + context: { + title: 'My Cartridges' + } + } + ], + header: [ + { + partial: 'header', + context: { + title: 'My Cartridges', + my_cartridges: true, + button: { + link: '/cartridges.jag', + name: 'Subscribe to Cartridge', + class_name: 'btn-important' + }, + has_help: true, + help: 'Create cartridges like PHP, Python, Ruby etc.. Or create data cartridges with mySql, PostgreSQL. Directly install applications like Drupal, Wordpress etc..' + } + } + ], + title: [ + { + partial: 'title', + context: { + title: "My Cartridges" + } + } + ] + }); +}; \ No newline at end of file -- 1.7.9.msysgit.0